Updated to version 0.3 for handling of non-RFC compliant servers