Block enhancmenets
Merge remote-tracking branch 'origin/master' into feature/block_enhance

Conflicts:
	src/combine.cpp
	src/options.cpp
	src/options.h
Merge pull request #1 from bslack/feature/block_enhance

Block enhancmenets