updated with arquillian and aerogear