Fixes #34 and Fixes #35