removed fixthis
Merge pull request #169 from PCCMathProgramReview2014/alex-work

removed fixthis