Merge pull request #1 from ChrisTheTree/jmok-android

Jmok android
Some minor tweeks