Fixes #24 and #25