Issue #70

Solves #70