Fixed namespace collision
Merge branch 'master' into diagrams