fixed errors
Merge branch 'master' of https://github.com/id175196/cs262