Solves #35
Merge pull request #36 from tallesl/issue35

Solves #35