Close issue #76