Solves #18.
Solves #21.
Merge pull request #23 from andrezrv/issue#21

Merge pull request #23 from andrezrv/issue#21.