fixed issues specified in pull request