Merge pull request #39 from HarlanH/master