individual shape functions
Merge branch 'master' of https://github.com/eprouver/drop-the-tea