Merged changes of james147.