Minor changes to ensure Java 6 compliance.

Also added sample input file.