Merge pull request #558 from FransTwisk/master

Merge