Merge pull request #2 from Cdevenish/master

Merge to web