Move #ridley_connection to private methods
Merge branch 'master' into berks_lock