Some tests; some buges (fixed and added :) )
Merge