- Fix bug #2
 - Do correct Content-Disposition handling

IMPORTANT: These changes were not tested! I gave up making Eclipse compile the project after ~3h of downloading, installing, head-banging, screaming, cursing...