Merge pull request #1 from fennb/master

Update