Fix 'cw' bug #488
Merge pull request #514 from pebble8888/fix488

Fix 'cw' bug #488