Merge pull request #384 from kevinpbuckley/5-7