Created by: hudochenkov
I've noticed this part is outdated, so I took this change from master.
master