Merge branch 'master' into lab04
Lab4 work and review
Merge pull request #47 from dinob0t/lab04

Lab04