Merge pull request #365 from kevinpbuckley/5-7