More cleaning up
Merge branch 'master' of https://github.com/jpharo91/John-Ay190