Fix Issue #5 - Problem with saving connections as