Merge pull request #1 from silb/master

Update to latest