Support single-file format for 3.1
Update an error message and  the test
Merge pull request #9 from cognitom/single-file

Support single-file format for 3.1