include unintentially omitted block functions
Merge branch 'master' of https://github.com/Martindev/Martock

Update with online changes.