Fix #67 and update DScanner