improvements regarding #496
Merge pull request #497 from way2muchnoise/master

improvements regarding #496