Support different content types
Merge pull request #2 from justinsb/content_type

Support different content types