Merge branch 'master' of https://github.com/thalestpires/ufrj-lp-20131.git