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