Merge pull request #584 from bhariharan/master

Bug fix for duplicate AccountWatcher callbacks
Patch Release 2.2.1