IMPROVE code, support more custom messages
Merge pull request #2 from jsmolina/feature/improvements

IMPROVE code, support more custom messages