Adds info
Adds new class
Adds new class
Merge branch 'master' of github.com:renatocf/MAC0412