Fixes #23 and #24