Add support for uuids & irc commands
Merge remote-tracking branch 'origin/master'