changes iteration 2
changes of code review and new code made to iteration 2
changes made for code review
Merge pull request #6 from raulcabero/master

changes made for code review (merge)