add 2 functions for managing blocks
Merge remote-tracking branch 'origin/master'