Added TODO & support for non-SSL connections.
@lastcommit