Merge da Kally
Merge remote-tracking branch 'abel/master'