Last touches for today
Merge branch 'master' of https://github.com/kmcintyre/scewpt