Merge pull request #2 from jduck/master

Minor changes for Android 4.3
Merge pull request #3 from jduck/master

Fix the build -- oops
fixes for Android 4.3