Fixes #49 and Fixes #50