Fixes #14, See #11