Merge remote-tracking branch 'origin/colorscheme'
Merge remote-tracking branch 'origin/master' into colorscheme
add wombat and fix filename for terminal