Fix Issue #34

This PR fixes #34.