Merged Listener and Commands with main class for efficiency, added color parsing, etc.
Merge remote-tracking branch 'origin/master'