Fixes #8. Thanks