Closes #171