Optimized
Merge pull request #1 from vadzay/master

Немного причесал.