New WH Types
Merge pull request #113 from Maarten28/develop

New WH Types
Merge branch 'develop' into unset