koppepan is here.
Merge remote-tracking branch 'upstream/master'
Merge pull request #1 from uyaponz/master

koppepan's pull request