Fixes #5 and Fixes #6