Merge branch 'master' of https://github.com/marcosbc/trabjun2013