Merge pull request #112 from PCCMathProgramReview2014/chris-work

changes from Matt Funk (about SE) and one fixthis hopefully resolved