Merge pull request #2 from t73biz/revert-1-Test-Tasking

Revert "Test tasking"
Merge pull request #3 from t73biz/develop

Merge pull request #2 from t73biz/revert-1-Test-Tasking