Closes #16, #18
Closes #16, #18

Signed-off-by: Fernando Ortiz <3d5eaea1c49a21fc055fa618e4738d78f736fb2d@gmail.com>

Spice-King/hubot-irc,Jaglag/hubot-irc,Jaglag/hubot-irc,miyazakijunichi/hubot-irc,BenoitZugmeyer/hubot-irc,nandub/hubot-irc,BenoitZugmeyer/hubot-irc,miyazakijunichi/hubot-irc,nandub/hubot-irc,Spice-King/hubot-irc