enhanced content disposition handling
Merge pull request #2 from bmckinney/master

enhanced content disposition handling