Merge branch 'refactor'
Merge branch 'master' of https://github.com/pikesley/uncle-clive