Close issue #7