initial
Merge pull request #1 from Simn/master

Initial