Merge pull request #56 from adamroach/attributes

Fixing the wack
Now deals with fmtp (very primatively)
Apparently m-sections are important?