fixed errors
Merge branch 'master' of https://github.com/x10an14/TDT4255