more changes
changes
Merge branch 'unstable' of https://github.com/Mathiastello/VSM into unstable