optimized code
Merge pull request #13 from bennya8/2.0.0

optimized code