Fixed configuration docs, refactoring
Merge pull request #1 from mbacovsky/initial_fixes

Fixed configuration docs, refactoring