Done #5, dev #66, improve blocks, refectory block's tests
Merge remote-tracking branch 'origin/develop' into develop