Change over to Simplicity
Merge branch 'master' of https://github.com/stephencapes/simplicity