Merge pull request #16 from p1tz/master

update
add global config
fixes