merge @medicalwei Pull Request #2, #3.