Pr/152

Updated the PR #152 to take the changes from @Ulrhol and break the configuration out.