crash fix
Merge pull request #116 from herbatnik/android

[Android] crash bug fix