Fixes #18 and #19