Update 16/11/2557
Update

servername username dbname
Merge remote-tracking branch 'origin/hj'