jwijffels Merge pull request #7 from jeroen/master