Now using Bluebird promises
aligned variable name
Merge remote-tracking branch 'softec-si/master'
Use new Promise instead of Promise.defer