Add option to disable smart join feature - fixes #5