A lot of changes - Project imported to an Android Studio
- fixes and improvements