Merged with master.
Simplify code.