Fixes #4 and Fixes #5