Fix — Merge #5 (2)

Last bugs fixed.