Merged rc-0.0.1; also, tests pass