Fixes #45
Fixes #105
Fixed #106