Fix #331 and add documentation about #337

Signed-off-by: Clement Escoffier <clement.escoffier@gmail.com>