Merge pull request #440 from kevinpbuckley/5-7