Tidied up.
Merge branch 'master' of https://github.com/ariesmcrae/android001