Merge pull request #270 from gsalinas/can-namespace-pr

Merge pull request #270 from gsalinas/can-namespace-pr #26