[fix] Fixing issue #13 and adding some small changes