Fixes #23, among other things
Merge branch 'master' of https://github.com/Hackerpilot/DCD