Added return
Merge branch 'master' of github.com:fchoo/lab4