Merge pull request #19 from Olyol95/master

Subgroup2
Merge pull request #25 from Olyol95/Subgroup2

Merge pull request #19 from Olyol95/master