fixes #65 along with some additional specs