Implement merge with master branch so that we have the new problem
Merge pull request #1 from joshWyatt/master

Implement pull from master branch so that we have the new problem