Merged: https://github.com/aerogear/aerogear-js-cookbook/commit/6b4d496a7004476cc52f9af7da506f1f35b92f35