Merge pull request #10 from cfeher/master

Merge pull request #9 from cfeher/chris-feher