Merge remote-tracking branch 'origin/master'
Signed-off-by: Karim <Karim@172.16.218.233>
some enhancements and cleanups

Signed-off-by: Karim <Karim@192.168.1.66>