Fixes #45. Also added some sort of support for DSQ/DNF.