Merge pull request #1 from danherd/master

Merge changes into master