Merge pull request #14 from PayBas/ticket/12662

Manually merges #14, close #14