I modify my previous comment. I will merge some bug fixes