Merge pull request #1 from lmudvaynel/master

New updates
Fix styles issues
Merge pull request #2 from simutin/master

ew4t32