Commit B
Merge pull request #5 from jurgenrentinck/development-29-11-2

Commit B