more this and that
Merge pull request #151 from PCCMathProgramReview2014/alex-work

more this and that