fiddly bits
Merge branch 'master' of https://github.com/dhmn/dhmndroid