Issue #58 attempted fix
Issue #59 Fix
Creating APK 1.7201 APK for Issues #58, 59