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