updated apk with issue #25 fixed