Merge pull request #284 from retro-wertz/buildfix_android