Synchronise jbidwatch code with the branch at ruippeixotog/jbidwatcher