Improvement

Fix issue #11.