Simpler default configuration
Updated instructions in README
Merge remote-tracking branch 'upstream/master'