some changes
some changes - round 2
forgot to add config.sample.php
Merge pull request #2 from patschi/master

some changes