forked watch, fixed some bugs - View it on GitHub