Kal jul 11

Hi Paul,

Here's a branch with the recent changes integrated into development.

Cheers,

Kal