First code commit
Merge pull request #1 from tomvantilburg/master

First code commit