Fixes #4 and Fixes #6