First #11 version
Fixes #11