Fix/issue40

This fixes #40