Fixes #33 and #34