Fix the error with multiple didReceiveData callbacks and refactor
Merge pull request #2 from damonjones/master

Fix the error with multiple didReceiveData callbacks and refactor