the dictionary lookup method updated to cope with the change of PD API.
Merge branch 'development'