add GlobalConfig class to override error handling
Merge remote-tracking branch 'origin/master'