Merged Philip-Nunoo 's commit d9b8f27cb1e4f8a479c28ce650358ebdcf089c1a

Signed-off-by: Exikle <dixondcunha@hotmail.com>