Reworking the parse functions
Reworking the organization
Update README, make -i required
Merge pull request #30 from johnb30/reorganize

Reorganize