Close issue #93