lots of stuffs added and fixed
Merge origin/master