added support for Android