Fixing Issue #1.
New Version (1.2.1)