Add documentation and exceptions in command and config section
Resolve merge conflicts after big changes
Resolve merge conflicts after big changes
Merge pull request #34 from vergissberlin/master

Add documentation and exceptions in command and config section