Fix/issue 71

In response to issue #71