filipzava Merge pull request #13 from yeyuguo/master