Merge pull request #214 from sbsimmons/master