Change color scheme, minor bug fix
Merge remote-tracking branch 'origin/master'
Change color scheme