Develop update with DEBUG fixes

Okay I have the DEBUG fixes merged to poco. Want to merge and make a release tag for Apothecary?