Merge pull request #1 from nforge/master

Update