Please take a look at my comments here: https://github.com/aerogear/aerogear.org/pull/189/files#diff-b363d6fdda1e758074d29b002ced3d41R668