Merge pull request #1 from svinota/master

Sync with original