Use async.waterfall to simplify registration code
Merge pull request #38 from ebu/simplify_registration

Use async.waterfall to simplify registration code