Feature/responsive

Fixes #16