Merge pull request #6 from jambola2/master

Test: Merge with conflicts