Merge pull request #363 from h-a-r-d-i-k/bug-fixes

Merge pull request #363 from h-a-r-d-i-k/bug-fixes #96