Merge pull request #7 from CalZoneVUB/SPMP

Merging the pull request of the SPMP's
SPMP

Update
Merge pull request #8 from CalZoneVUB/SPMP-PIETER

Spmp pieter