created new branch
Added support for Q and when.js