safer names for graphs
Merge branch 'master' into sinatra