Merge pull request #27 from myui/feature/cw