Refactor parser and add defines for cv classes to make cleaner
Merge pull request #17 from rmtmckenzie/Morgan

Refactor parser and add defines for cv classes to make cleaner