Merge pull request #1022 from toopay/pdo

Fixed PDO issues.