Version 1 4 willemdev

Fixes #44