Fixes #11, Fixes #5