Fix for issue #204.

Fixing build issues
Merge remote-tracking branch 'origin/namespaceBr' into namespaceBr