Added watch capability in version 1.2