code review
Merge pull request #1 from ctrucza/master

code review