closes #67 and more android-app friendly