Fixes #106
Fixes #110
Merge branch 'visualizations' into skeleton