Merge pull request #228 from Alexpux/develop

Optimizing.