updating to handle multiple suffixes
Merge pull request #1 from rcarvalho/master

updating to handle multiple suffixes