not quite there, needs clean up of user configuration
Merge remote-tracking branch 'origin/master'