Updating to new -- format
Merge pull request #1 from guilhermesilveira/master

Updating to new -- format