Full functional first version

Still in "dev" version because it needed some tests ...