Changes to correct things and suit my Library

Signed-off-by: Arnab Naha <superarnab@gmail.com>
Visitor Bug Fixed

Signed-off-by: Arnab Naha <superarnab@gmail.com>