Merge pull request #1234 from cilynx/fix/get_pid_settings