changes from Alyson
Merge pull request #85 from PCCMathProgramReview2014/chris-work

changes from Alyson