Added fixes for pull request