Second round
Merge pull request #2 from leaComoyo/master

Second round