Less hacky
Merge pull request #404 from way2muchnoise/1.7-update

fixes some rendering issues
Merge pull request #403 from hilburn/1.7-update

Less hacky