Initial commit

Initial commit, migrate from Google Code, r18