fixes to close #164
Merge branch 'master' of github.com:joshreisner/icph