Issue 446: fixed bugs and small changes/enhancements (#454)
Issue 446: fixed bugs and small changes/enhancements (#454)



sukeesh/Jarvis,appi147/Jarvis,sukeesh/Jarvis,sukeesh/Jarvis,sukeesh/Jarvis,appi147/Jarvis