Merge pull requests

#15, add new config.sample.php