Fixes #3 and Fixes #4