Feature/configuration

works towards #20