Fix for Issue #6: Applied the fix on a branch and re-submitting pull request