Merge pull request #2 from diegolovison/master