Merge pull request #2 from ARGOeu/devel

Sprint 22 Release
Merge pull request #5 from ARGOeu/devel

Sprint 24 release
Updated prefilter
Merge pull request #6 from pkoro/devel

Updated prefilter