Changed tabs to spaces
Changed config file to json
Reload modules when restarting class
Merge remote-tracking branch 'parent/master'