Merge pull request #2 from yiisoft/master

switching base