Bug#5901 fix some minor bug and change port
Merge pull request #161 from vigov5/bug#5901

Bug#5901 fix some minor bug and change port