Merge pull request #366 from kevinpbuckley/5-7