Merge pull request #1 from hangum/1.2.0

1.2.0