Fixed pull request issues

fixed issues