Added terminate operation. Fixed issue with username without ."