Close issue #37