moving changes done at master to VRaptor4Version