Merging Nick Rolan's features to the master (https://github.com/nrolans/ssld-extract)