Additional Fix for Issue# 169
Merge pull request #171 from smarthi/suneel

Additional Fix for Issue# 169