merged at https://github.com/aerogear/aerogear-js-cookbook/commit/d748d75df0dcbcaec817cbc97749f36ba610c45a