explanation
Merge pull request #3 from mstoye/origin/master

merged code