Merge pull request #656 from nlhintz/pull-request