Fixes #351 Fixes #285
Merge pull request #398 from headswe/Fixes

Fixes #351 Fixes #285