Compatibility with Android Studio v. 0.5.1
Merge pull request #170 from MrCustomizer/android-studio

Compatibility with Android Studio 0.5.1