Merge pull request #4 from knrc/wip

Updated to include reference information and fix filtering