improved output
Merge branch 'master' into testing
added wget/curl switch
Merge branch 'master' into testing
more stuffs changed
Merge branch 'master' into testing
testing diff config