Fixing issue #13 (close issue)