jc's mac changes
Merge branch 'master' of ssh://git@github.com/rongjc/icreate.git