Fixed header namespace issue
Merge pull request #158 from tobyk100/headers

Fixed header namespace issue