Resolves #70

Resolves #70