Merge pull request #3 from yiisoft/master