Merge branch 'master' of https://github.com/mworchel/cg1
Merge branch 'master' of github.com:metaxy/cg1