states return callables
Merge pull request #18 from MarvinT/shape

shape fix: states return callables