Fix Issue #34

This PR fixess #34.