Merged, added clickdrag support.