Merge pull request #6 from paul-hoehne/master

Adding headers support & rename