Fixes #92 and #93