Merge pull request #1 from Blondas/master

first commit
change
solved conflict