Merge pull request #35 from mvanduijker/master

Implemented custom config file option
cs fixes
Merge pull request #36 from fieg/cs-fixes

cs fixes
Create README.md