Updated to work with gradle 2.1