Continued on the refactoring.
Merge branch 'devel' of github.com:emanuelpalm/pvmc into devel