Merge pull request #9 from Power-Pill/dmitry

[CT-*] Improved blocks model