Close #699 (closed)
The following changes are made on top of (!193 (21423c9e)) changes:
Signed-off-by: Le Van Quach levan.quach@kalpa.it