Merge pull request #1 from fsprojects/master

Update from original