Fixes #9, Fixes #8