Merge pull request #88 from PCCMathProgramReview2014/chris-work

Chris work