Merge pull request #380 from kevinpbuckley/5-7