Merge pull request #1 from madowlet/master

fixing