Fixed disconnect issue #138
Merge pull request #139 from tomvantilburg/master

Fixed disconnect issue #138