Resolves Issue #40

...