Merge pull request #95 from dogsleg/master