Merge pull request #124 from wshafer/master