Android build fix
Merge pull request #470 from JonCanning/master

Android build fix