Merge pull request #2 from stena/master

Merge the things now