Upgrade for 0.10
Merge pull request #15 from zpao/0.10

Upgrade for 0.10