Updated README
Updated README
Updated README
Updated default config
removed example config, added it to the wiki
Merged #37 and included fixed for issue #39
Merged bug fixes from master