Remove maintenance message
Add colors
Merge remote-tracking branch 'origin/master'