Commit 16/06/2014 - André Farias