commit 8

the development is finished
commit 8

last modification hopefully :)