Merge pull request #370 from ndawe/master

[MRG] roosh: huge speed improvements via lazy lookup