Changed constructor
Merge branch 'master' of https://github.com/jsarafajr/labs_oop