Updating Makefile a bit
A little tuning (some simplifications)
Updating test

Very interesting feature by the way