Last fixes. Today I am going to convert it to the Maven project. It will
be the end of my work.