fix
Merge pull request #167 from PCCMathProgramReview2014/chris-work

fix