Fixes #8 fixes #11