Class A: new methods map and filter
Merge branch 'develop'