merge
Merge branch 'master' of github.com:Fredrik89/mt

* 'master' of github.com:Fredrik89/mt:
  more fixes
  small fixes
  small fix in problem formulation again
  small fix in problem formulation