Working

Fix issue #6