two classes, self has been replaced by node
Merge branch 'master' of https://github.com/danieleldjarn/University-of-Iceland