Fixes #107

[kaleb]

Before to submit your pull-request:

• Be sure that the unit tests pass
• If you create a new feature, test your code, do not introduce new bugs
• Avoid code duplication
• Small pull-requests are easier to review and can be merged quickly
• 1 pull-request == 1 feature/improvement

[ruscoder]

Hello @kaleb! Thank for your contribution. We are going to use your solution to re-write #111 in a more elegant way.