Corrections to include lookup and tests
""
Merge pull request #306 from mballance-sf/master

final bug fixes