Yasa's pull req

Please accept my pull request.