Major fixed by Carl's task ^^
Merge branch 'master' of https://github.com/Stepedons-Tinkers/jardine-android