Many fix #2360
Merge pull request #10 from Asetss/master

Many fix #2360