wscherphof Merge pull request #1 from thefosk/master