Merge pull request #1 from scento/master

Merged
Fixed config parse
Fixed code format
Fixed documentation type
Merge pull request #35 from lewisay/master

Fixed config parse
Minor changes