isolating configuration
Merge pull request #131 from bolandrm/refactor_config

isolating configuration