Fix PR #102 changes that are cause due to #103
Merge pull request #104 from shivapoudel/patch-3

Fix PR #102 changes that are cause due to #103