fixes #33, and #34