shape for stone cathode
Merge branch 'master' into sinatra