Close #145, implement new config system