Merge pull request #441 from kevinpbuckley/5-7