Update config sample
Add documentation, as discussed in issue #50
Merge branch 'master' into devtest