Alpha 0.1.2

Successfully compiles on Android Studios. Merging into master.