Merge pull request #405 from kevinpbuckley/5-7