Merge pull request #1 from discoverygarden/modular

update repo
adding performance tuning suggestions from Bayer
Merge pull request #40 from lutaylor/modular

these suggestions are amazing