Fixing Issue # 36

This PR fixes Issue #36