Merge pull request #3 from leenaars/master