some updates
Merge pull request #7 from qiqiapple/master

some updates