Merge pull request #425 from danut007ro/master