Merge #56d5785 for non auto update checking + full implementation of the option.