various changes
Merge branch 'master' of https://github.com/irvingtan/CS3750