added some things
Merge branch 'master' of https://github.com/Kevin-Lei/PAS14