Implemented #966.  --------- Signed-off-by: George Araujo <george.gcac@gmail.com>
 --------- Signed-off-by: George Araújo <george.gcac@gmail.com>