refactor and addition of multiple format types
Merge pull request #9 from kmchugh/dev

refactor and addition of multiple format types