Merge pull request #108 from jkent/master