tidying up
Merge branch 'master' of https://github.com/esr360/onenexus