code review 1

code review 1
Merge pull request #5 from iordi/master

code review 1