added validation for connection, popup notification on errors
Merge remote-tracking branch 'origin/master'