added from kmy0ra2
Merge pull request #1 from kmy0ra2/master

added from kmy0ra2