Fixed errors caused by latest commit
Merge branch 'master' of github.com:joakikr/inf5750