2017-02-25 - scruss
 - basic revision from scanner output from 2010

