Update documentation
Move command line options to separate class
Merge pull request #118 from yous/patch-option

Move command line options to separate class