New changes
Merge pull request #2 from ShooterArk/master

unsmelly code