Less hacky
Merge pull request #403 from hilburn/1.7-update

Less hacky