Merge pull request from Crisu83/master

Merge pull request from Crisu83/master