Merge pull request #2 from zumbrunnen/master

Updated to most recent API version, Android Studio compat