Added Patrick's changes
Merge pull request #8 from Olyol95/Subgroup3

Added Patrick's changes