no more static methods
no more static methods
no more static classes
fix for connection failed
merge from github