lalalala
Merge pull request #1 from yangwendy/slave

merge into master