Fixes #33 and fixes #32