Commit reference to issue #37