Fixes #58

Fixes #59

Fixes #60