Fixed spelling error and variable name collision.
Merge branch 'feature-threadsafe-tasks' into wakame-edge