Adding PR #7 for fixing #6