Update from macpro
Merge branch 'master' of https://github.com/weihuangwong/iit