Merge pull request #31 from eliagbayani/master

Use FileIterator and general code maintenance.
Added some checks to prevent accidental deletion