Bug fixes
FIxed android 2.x crashes
Merge pull request #27 from DrKLO/dev

sync fork