Updated DScanner to fix #27