Project 2 stage A (not tested yet)
Merge pull request #7 from cmhbenjamin/master

Project 2 stage A (not tested yet)