First commit
Load config
Remove unused throws
Merge remote-tracking branch 'origin/master'