Further cleanup of Problem 14
Merge pull request #32 from johnbfair/master

Further cleanup of Problem 14