Adjustments on self.stuff
Merge branch 'designpatterns' of https://github.com/EP-USP/mini-ep6 into designpatterns