Merge pull request #73 from jeffhammett/master