Set filtering to false for everything except version.prop
Added missing null pointer check
Merge pull request #95 from romovs/upstream

Set filtering to false for everything except version.prop