Merge pull request #39 from PyAr/leandrobrunner-issue_34

Leandrobrunner issue 34
issue #23