Merge pull request #3 from denis-mentey/master

Some performance issues fixes