Fixes #58
Fixed #57