Merge pull request #61 from jpmckinney