(#38) Refactored the graph directive controller
Merge branch 'feature/38-refactor-graph-directive-rebase'

* feature/38-refactor-graph-directive-rebase:
  (#38) Refactored the graph directive controller