Merge pull request #646 from leider/master

fixing #647 and small update of dev-dependencies