integrate changes in #40
Merge pull request #41 from cordoval/41-integrate-changes-from-pr-40

merge #41 integrate changes from PR #40 (cordoval)

This PR was merged into cordoval:master branch.

Discussion
----------

Sent using [Gush](https://github.com/gushphp/gush)

Commits
-------

74ff217e6afccc61bff0a1b25a850b53fbd17306 integrate changes in #40 (cordoval)