Added support for full multi-file hadnling (Fixes #8)