Fixes #64 and also resolves #5