more editing
Merge pull request #51 from PCCMathProgramReview2014/alex-work

more editing