[171] fix #24
[187] Merge branch '#24_001' into version_1.3_beta

Conflicts:
	AndroidManifest.xml