Development

Fixes #4