Merge pull request #161 from Sander80/master