core edits
Merge branch 'develop' of https://github.com/nuroko/vizkit.git into develop