Initial commit.
Merge cw-gears/master