Merge pull request #528 from ioanpocol/devel

Devel