Added int w.

Please pull to master this patch-2