Fix Issue #22

Thanks to Skaronator and Cookiezzz

+ Additional PDO implementation improvement