Fixes #39 and #40