new stuff
Merge branch 'master', remote-tracking branch 'origin' into errorcheck
updated error checking