Header include bug fixed
Pd patch update
Merge pull request #1 from iannix/master

Update from original