Backwards compatibility improved.

Project can be combile for JDK 5 or 6.