Close issue #139