Merge pull request #6 from VeoPVM/develop

Improvements
Merge pull request #1 from dopeh/develop

Merge pull request #6 from VeoPVM/develop