Contribution to be merged in a different branch.
Merge pull request #3 from MagicCandy/merge125

Contribution to be merged in a different branch.