Merge pull request #1 from rodolfospalenza/master

dojo 31/08/2013
Merge pull request #1 from rockandrails/master

Merge pull request #1 from rodolfospalenza/master