Merge branch 'connection-error-handling' (PR #16, issue #6) into 0.4.0-release