edited by sam
Merge pull request #2 from sgijsber/master

edited by sam