Merge pull request #6 from VeoPVM/develop

Improvements