Separated calls into constructor to avoid opening unnecessary
connections to server
test
test
Merge pull request #27 from Agfct/Variousimprovs/fixs

Variousimprovs/fixs