Merge pull request #99 from dogsleg/master