edited some APIs
Merge branch 'master' of https://github.com/benchisa/CS3202