calvin's changes merged to my master

calvin's changes merged to my master