Fixed #158, fixes #159, fixes #160
Fixes #155