Added tendency to observations by two filters
Closes #41 and first version of #40
Fixed a failing test
Fixed two failing tests
Merge branch 'develop'