Fix issue #1 / close #1