changed the line ending from dos to unix
Overridden methods are now public, to avoid compilation error with Java7.