more null checking
optimized import
fixed oreDict with giant refactor
extra null check
Merge pull request #194 from way2muchnoise/1.7-update

Null checking, Optimization and the oreDict fix