Fixing #1
Issues #1 and #2