Some fixes
Merge pull request #16 from kkieczka/android-fixes

Some fixes