Tkuldeep/issue 85

reference -> #85