Merge remote-tracking branch 'origin/mac'
Merge branch 'master' of https://github.com/limestone/compen