Updated for angular 1.2.0