issue#33 and issue#34
Merge pull request #35 from DavidPinho/issue-33

issue#33 and issue#34