Merge pull request #2 from wvanderp/master

master