integrated kalimba/pd
Merge branch 'pd'