Xufeing merge + misc changes
Merge branch 'master' of https://github.com/kane86/DSLab3