Corrections

Corrected a bug
Adapted files to use Android Studio 0.8.11