Merge branch 'issue349_refactoring_typescript'
Merge branch 'master' into issue330_d3layout