Fixes for android
Merge pull request #13 from klokik/android

Fixes for android