Tidy up old changes
Merge branch 'master' of https://github.com/cerijerome/ceri