v0.1.25 quick fix for connection exception on windows
Merge branch 'release/v0.1.25' into develop