JVidalN Merge pull request #1 from JVidalN/custom_handlers