Added colored name tag
Fixed shit
Fixed more shit
Merge remote-tracking branch 'origin/master'