Merge pull request #118 from fsb4000/Android