Improved support for android. See issue #75