Feature/21 config

#21