hGraph now fixed
re-organized on this branch
Merge branch 'master' into new-branch
merge fix
Merge branch 'master' into organization
massive changes