Fixes 3
Fixes #5
This fixes #6 and also resolves #5