Cleanup and addition of a startup variable
Merge remote-tracking branch 'origin/master'