pull request from sannong Nov,12