Merged pull request from sjhx