sync with the oficial version

See #371