Fixes #6, #5, #4, #3
Fixing close issue