Close issue #58