Merge pull request #495 from way2muchnoise/master

fixes #489
improvements regarding #496