Initial version.
Minor config fixes.
Merge remote-tracking branch 'origin/master'