reconnect
fix conflict
Merge pull request #2 from zingvy/master

fix conflict