sync with the oficial version

See #371
Merge pull request #372 from roro89/patch-2

sync with the oficial version