Merge pull request #28 from geo-harris/master