sphinx start rice
Merge branch 'tom'