Fix for Android Studio XML preview. closes #2 and closes #3