Rebased, updated accordingly to some changes.

Best regards,

Mikhail.