Optimized part of the wb_load function.
Merge pull request #2052 from pjackson28/master

Optimized part of the wb_load function