quick hack of lookup tool, correct typo
Merge remote-tracking branch 'upstream/master'
Merge pull request #12 from cd34/master

bunch of updates, quick hack tool