Fixes following issues: #2, #3, #4