Fixes #82
Fixes #89, #95
Fixes #96, #77
Update demo
Fixes #78
Fixes #81
Merge branch 'fixes/graphics' into develop