Actual Release 2

Added multi-file support