Merge pull request #107 from r3dunlop/master

Cleaned up merge conflicts from last night
Merge pull request #108 from pcbend/master

Merging branches
Merge pull request #109 from pcbend/devel

Merge pull request #108 from pcbend/master
removed Long64 and changed spelling of filter