remove key and values header and also remove 's
Merge branch 'master' of https://github.com/dineshrabara/bugonemail