Updated to support gradle 2.0