Merge pull request #1 from brtz/develop

catch ConnectionError exception
Merge pull request #4 from brtz/master

Merge pull request #1 from brtz/develop