Android support
Merge pull request #5 from Hugmeir/master

Android support