[#master] solucao tmp
Merge branch 'master' of https://github.com/wwagner33/solar