- add Content-Location and Content-Id support
Merge pull request #10 from mbaechler/location+id-support

- add Content-Location and Content-Id support