Solved too! So we are ready to merge... \o/