Merge pull request #360 from kevinpbuckley/5-7