updated for bugs reported during the demo
Merge branch 'master' of https://github.com/alekhurst/CleanSlate