Feature: make this multi task friendly

This is also backwards compatible.
Merge pull request #6 from williamsbdev/master

Feature: make this multi task friendly