release2 commit
Merge pull request #1 from kthumin/release2

merge with release2