Merge pull request #388 from kevinpbuckley/5-7