Fix namespace issues
Merge branch 'master' of github.com:centraldesktop/graph