Fix #151 - Code corrected with Android code style added to Android studio, following guidelines.