20140929EX
Merge remote-tracking branch 'upstream/master'
20140929EX
Merge pull request #25 from eto820826/master

OK