Bug Fix #229 for Android
Merge branch 'dev' into test