changes from Steve
Merge pull request #111 from PCCMathProgramReview2014/chris-work

changes from Steve