Merge pull request #2 from xcvista/master

Update with master branch
Merge pull request #2 from shisoft/master

Update with branch