Updated in prep for phase one testing
Merge pull request #16 from matthewste/master

Updated in prep for phase one testing