Faster!
Merge pull request #195 from wmmc/patch-1

Faster!