Solve Issue#60

Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>