Fixes #33 and #35