Solves #22.
Merge pull request #24 from andrezrv/issue#22

Merge pull request #24 from andrezrv/issue#22.