According to rfc2045, the media subtype is a token, not an atom.

Fixes issue #14