For documentation.
Merge branch 'general-refactoring' of https://github.com/inpho/vsm into general-refactoring