Add option to disable smart joins feature - fixes #5