changing values of constructor
Merge branch 'DanielNavia/master'