ported corpaul last changes
Merge branch 'graph_swift' of github.com:badrock/gumby into graph_swift