updated to sonar 3.6