Merge pull request #1 from DAMConsortium/master

Fixed issue with server_address option