Manually merged changes from https://github.com/Hackerpilot/Dscanner.git