Added command line options and checks
Merge branch 'master' of github.com:rwfeather/autotest-sp2 into new
Merging to recent
Got it to compile
Merge branch 'master' of github.com:rwfeather/autotest-sp2
Attempting merge