Merge pull request #17 from ancafarcas/master

original_creator problem solved