replacing outdated PR (https://github.com/aerogear/aerogear-unifiedpush-server/pull/180) with new one!