Close issue #70