(fix namespace declarations  #17)
Merge pull request #18 from tomkralidis/master

(fix namespace declarations #17)