working on android
Merge pull request #6 from jamesyothers/master

working on android