code review #1
Merge pull request #1 from mircealungu/master

code review #1