Merge pull request #1 from jasnell/master

Merge to site