Merge pull request #1 from Progroep/master

Update gouwestadmm fork
Update
Update
Update
Merge pull request #2 from gouwestadmm/master

Update from MM fork