This PR is based on https://github.com/aerogear/aerogear-controller/pull/63 and will be rebased when that PR has been processed.
This PR is based on https://github.com/aerogear/aerogear-controller/pull/63 and will be rebased when that PR has been processed.