Speed up
Merge pull request #2 from arcao/dev

Speed up