Optimized, not need function
Merge pull request #70 from KDGDev/master

Optimized, not need function