Merge pull request #19 from Olyol95/master

Subgroup2