Copied code
Merge pull request #270 from Lerogero/master

Copied code