Less overhead on refreshes
Other optimizations
Merge pull request #338 from barijaona/speedOptimization

Speed optimization - tested OK on Snow Leopard 32 bit and Yosemite