Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
Patch by Dan Lykowski <lykowdk@gmail.com>, closes #181. Minor fixups for kdrive by me.