Plug header leaks
Merge pull request #31 from hyc/fix2

Plug header leaks