Revert "For issue #13"

This reverts commit 8decc7c504c07e12e16f9f9085d17b880a9be03c.
For issue #21