Merge pull request #6 from jambola2/master

Test: Merge with conflicts
Merge pull request #7 from jambola2/my-branch

Merge pull request #6 from jambola2/master