performance fixes
Merge pull request #4 from hydrox/develop

performance fixes