Merge tag '0.3.21' into develop

Released-0.3.21 0.3.21
added manual condition handling to find method
bumped version
Merge branch 'release/0.3.22'