Issue 309

Implements #309