Fix Issue #37

This pull request fixes #37.