Merge pull request #5 from yiisoft/master

switching base