Dirk branch

Merging into master