Merge pull request #472 from way2muchnoise/master

fixes #471