Merge pull request #381 from kevinpbuckley/5-7