issue 40

Closes #40