Merge pull request #327 from tjschuck/master