Adding the format change to my wrapper.
Merge branch 'master' of github.com:caldweba/HPSC_project_fall_2014
Merging to include my format changes.