Squash
Merge pull request #2 from vesita/radeva/2

Branch 2