registration added
connection finished with error method added
Merge remote-tracking branch 'origin'