Merge branch 'issue/90' into 'develop'

src/api/controllers/data.ts

src/common/query.ts

src/core/engine.ts

src/util/graph.spec.ts

src/util/graph.ts

src/util/viewHandler.ts

test/scenario.ts