Improving changes from pull-request #8
Merge pull request #9 from remie/feature/pull-request-#8

Improving changes from pull-request #8