Merge pull request #2 from landrews/master

Merge pull request #1 from landrews/master