Fiddling with a little this and that
Merge branch 'master' of https://github.com/tommilburn/214p2