This commit fixes #60 e fixes #62 e fixes #63
Merge pull request #64 from spolti/Issues60e62e63

This commit fixes #60 e fixes #62 e fixes #63