Merge pull request #146 from way2muchnoise/1.7-update

close #68