commit prior to merging to one class
Merge branch 'master' of https://github.com/masodonis/nolmy001diogy001