Update README.md
Update main.cf.ex
Merge pull request #1 from bjoe2k4/patch-1

Update README.md
Merge pull request #2 from bjoe2k4/patch-2

Update main.cf.ex
Merge branch 'master' into ppa
Version 1.0