added CW
debugged
Merge pull request #4 from JunTakagi/feature/CW

Feature/cw