Merge pull request #1 from westover/master

Merging