Should use Java 1.6, and cleanup of the file
Merge pull request #16 from pascalrobert/master

Should use Java 1.6, and cleanup of the file