catch up changes of master and typo #45

catch up changes of master. #45
typo ex. -> e.g.
please. merge 1.0.x