Merge pull request #1 from plafuro/master

Minimal refactoring
Merge pull request #2 from plafuro/master

Added stub implementation of NICK command. Refactoring
Refactored test
Merge remote-tracking branch 'upstream/master'