Merge pull request #132 from kkawakam/2.0

2.0.0-alpha