Pull Request from Master Branch to Leonid's Fork