Merge branch 'release/0.0.2' into develop
Refactor to change filtering to post recursive query
Merge branch 'release/refactor'