Solves #19.
Merge pull request #36 from andrezrv/issue#19

Merge pull request #36 from andrezrv/issue#19.