Patch for issue #150

Hey, this should sort out that issue of namespaces in the headers not being added correctly. 
Added a new test for it and all looks OK.