add config parsing
merge branches