Merge with aku's branch.