Pull request to get code review going

Hi all

Please have a look and comment.

Regards
Rijk