Merged

Merged Pieter's branch with Fre's branch