import Q lib for promise/defer
Merge remote-tracking branch 'origin/master'