Closed #6

Fix issue #6