Fixing issue #16 and updating readme file