Complete
Merge pull request #1 from bford79/112014

Complete