Fixes #11 -