Feature/stop when full

Fixes issue #7