Some changes to make sure it works with the production server.
Merge pull request #3 from zjyemyob/master

Some changes on samples to work with production server