[DELIVERS #52661281] General API cleanup and improvements
Merge branch 'master' of https://github.com/castiron/didh