Merge pull request #59 from objorke/master

Update namespace prefixes and file headers