applied pull request 22 with commit ID 357975d