Merge pull request #3 from sosandstrom/master

Update to the latest