Merge pull request #2 from skyrising/master

Merge asdf and master
Merge pull request #3 from skyrising/asdf

Merge pull request #2 from skyrising/master