Created merge method for configs

* Created method ``merge()`` that do merges of configs;
* Removed some dead code;
* Renamed some variables with typo.
Merge branch 'develop'