Merge pull request #11 from mnicky/master

Close even more files to prevent 'too many open files' error