Merge pull request #1 from hugobomber/huge/lab6

Huge/lab6
Merge pull request #2 from hugobomber/huge/lab6

Huge/lab6
Merge pull request #3 from hugobomber/master

update master