Merge pull request #32 from xiaods/master

enhance some feature.