Merge pull request #1 from ruflin/master

Update to latest version