update
Merge remote-tracking branch 'origin/revolucas-update'
0.6.0.5.2