Merge branch 'master' into ross
Edited diamond notation and Node consistency
Merge branch 'master' into ross
Merge pull request #17 from mfrancis95/ross

Ross