connection test
conflict resolution after merge with ersatzryan:master