Made code consistent with C++98. Small clean-ups
Merge branch 'master' of https://github.com/Sheshuk/MRFEst