Merge remote-tracking branch 'upstream/master' into development
Merge remote-tracking branch 'upstream/development' into development
Improvement: check zookeeper server port
Merge pull request #25 from jucaf/development

Improvement