Merge pull request #1 from EduSoho/master