This commit fixes #58 and fixes #59
Merge pull request #61 from spolti/Issues59e60

This commit fixes #58 and fixes #59