Merge de cambios de jtalks

Merge remote changes to master fork into my own fork.