Merge pull request #36 from myrle-krantz/develop

tasks block commands when appropriate.