i think i got all the formats right now...
Merge pull request #46 from mesqueeb/patch-23

i think i got all the formats right now...