fixed MF regularization; closes #6
Merge remote-tracking branch 'origin/dev' into dev