Merge pull request #411 from kevinpbuckley/5-7