changes from 1/3 with Steve, Chris, and Alex
Merge pull request #60 from PCCMathProgramReview2014/alex-work

changes from 1/3 with Steve, Chris, and Alex