Updated version 1.6.1

Enabled DT2W/S2W by default