Fixed issue #132
Merge branch 'master' into feature/29-graph-ui