Fixed issue #31 - include guards are prefixed with PIX_
Merge branch 'issue-31' into develop