Cleanup
Changing to more androidy style
Merge branch 'master' into gh-pages