Issue #36: more work on fixing features issues
Issue 36: fix block bug
Merge branch 'fix_block_bug'