update MRF stuff
Merge branch 'master' of https://github.com/thorbenk/ia13project