Close issue #21