Rework
Merge pull request #1 from ffissore/master

Rework