Merge pull request #42 from csail-csg/master