Merge pull request #51 from Gonthim/master

Label text modification.
Merge pull request #52 from Gonthim/master

Refactoring
Merge pull request #53 from Gonthim/master

Refactoring
Refactored parts of the flow.