Merge pull request #30 from theuni/android