Fixes #39, Fixes #43