Merge pull request #7 from burkeholland/master

Merge