Fixed 1, 2-1.
Merge pull request #9 from DreamArts/feature/work

Fixed 1, 2-1.