Includes remarks from Davide Mentre #170