Refactoring Problem4
Merge pull request #2 from erik-johnson/master

Refactoring 4