elbrujohalcon Merge pull request #11 from inaka/elbrujohalcon.hipchat …