added a lot of things
Merge remote-tracking branch 'origin/master'
added a lot of things
check in more