Merge pull request #117 from khoa-nd/master

Please pull the latest code
Fixed some code.
Added the right server info.